Fix several g_new() calls which were using extra indirections or pointless

2006-01-18  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkrbtree.c:
	* gtk/gtktreemodel.c: Fix several g_new() calls which
	were using extra indirections or pointless casts.
	(#327423, Morten Welinder)

diff --git a/ChangeLog b/ChangeLog
index 3a51929786f567074d53e7403e3020ea5aa4cec8..db1fd1a60575dcb0335e385cfcd9d1cf43fa6fbc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-01-18  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkrbtree.c: 
+       * gtk/gtktreemodel.c: Fix several g_new() calls which
+       were using extra indirections or pointless casts.  
+       (#327423, Morten Welinder)
+
 Tue Jan 17 19:27:59 2006  Tim Janik  <timj@imendio.com>
 
        * gtk/gtkprogress.c: fix adopted from maemo-gtk.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 3a51929786f567074d53e7403e3020ea5aa4cec8..db1fd1a60575dcb0335e385cfcd9d1cf43fa6fbc 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+2006-01-18  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkrbtree.c: 
+       * gtk/gtktreemodel.c: Fix several g_new() calls which
+       were using extra indirections or pointless casts.  
+       (#327423, Morten Welinder)
+
 Tue Jan 17 19:27:59 2006  Tim Janik  <timj@imendio.com>
 
        * gtk/gtkprogress.c: fix adopted from maemo-gtk.

diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index 5573dc4757de16283cba2e3bad19e48c1e014128..08f86164f953a8c8b55ef6193da07793e243eb1c 100644 (file)
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-18  Matthias Clasen  <mclasen@redhat.com>
+
+       * io-gif.c (gdk_pixbuf__gif_image_load_increment): Don't cast
+       the results of g_new().  (#327423, Morten Welinder)
+
 2006-01-12  Federico Mena Quintero  <federico@ximian.com>
 
        * gdk-pixbuf-util.c (gdk_pixbuf_saturate_and_pixelate): Clarify

diff --git a/gdk-pixbuf/io-gif.c b/gdk-pixbuf/io-gif.c
index 4aa099a82d9f84c73e1c095503bc19dd01de30a3..b403d6fa5963d39921ac4ea8afabcf1d646ca0ee 100644 (file)
--- a/gdk-pixbuf/io-gif.c
+++ b/gdk-pixbuf/io-gif.c
@@ -1576,7 +1576,7 @@ gdk_pixbuf__gif_image_load_increment (gpointer data,
                /* prepare for the next image_load_increment */
                if (context->buf == buf) {
                        g_assert (context->size == size);
-                       context->buf = (guchar *)g_new (guchar, context->amount_needed + (context->size - context->ptr));
+                       context->buf = g_new (guchar, context->amount_needed + (context->size - context->ptr));
                        memcpy (context->buf, buf + context->ptr, context->size - context->ptr);
                } else {
                        /* copy the left overs to the begining of the buffer */

diff --git a/gtk/gtkrbtree.c b/gtk/gtkrbtree.c
index 32ac5719337ee366d595e80126e71338319a2c6d..b4f70641dd08f63d9f900ab33d538a4051eeffe5 100644 (file)
--- a/gtk/gtkrbtree.c
+++ b/gtk/gtkrbtree.c
@@ -334,7 +334,7 @@ _gtk_rbtree_new (void)
 {
   GtkRBTree *retval;
 
-  retval = (GtkRBTree *) g_new (GtkRBTree, 1);
+  retval = g_new (GtkRBTree, 1);
   retval->parent_tree = NULL;
   retval->parent_node = NULL;
 

diff --git a/gtk/gtktreemodel.c b/gtk/gtktreemodel.c
index 05b93ab926142aa9ee79b947f53c36f47b99bfd9..377108bebd94e407d8c03afc0c800e0cf64d28eb 100644 (file)
--- a/gtk/gtktreemodel.c
+++ b/gtk/gtktreemodel.c
@@ -328,7 +328,7 @@ GtkTreePath *
 gtk_tree_path_new (void)
 {
   GtkTreePath *retval;
-  retval = (GtkTreePath *) g_new (GtkTreePath, 1);
+  retval = g_new (GtkTreePath, 1);
   retval->depth = 0;
   retval->indices = NULL;
 
@@ -441,7 +441,7 @@ gtk_tree_path_to_string (GtkTreePath *path)
   if (path->depth == 0)
     return NULL;
 
-  ptr = retval = (gchar *) g_new0 (char *, path->depth*8);
+  ptr = retval = g_new0 (gchar, path->depth*8);
   g_sprintf (retval, "%d", path->indices[0]);
   while (*ptr != '\000')
     ptr++;